bail on db-cache restoration if format lookup fails

diff --git a/babl/babl.c b/babl/babl.c
index 12873839b7b0b927d3fc862ffdea01a06dd23c90..72f2327247847b5a0b7298006c03472e8e5ec9ec 100644 (file)
--- a/babl/babl.c
+++ b/babl/babl.c
@@ -350,9 +350,17 @@ static void babl_init_db (const char *path)
           break;
         default:
           if (!from_format)
-            from_format = babl_format (token);
+          {
+            from_format = (void*)babl_db_find(babl_format_db(), &token[1]);
+            if (!from_format)
+              return;
+          }
           else
-            to_format = babl_format (token);
+          {
+            to_format = (void*)babl_db_find(babl_format_db(), &token[1]);
+            if (!to_format)
+              return;
+          }
 
           break;
       }